From 5b5c8f23d9f0fa951ae6248aaf557bc64421f358 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 7 Jun 2011 18:36:57 -0400 Subject: [PATCH] GtkFileChooserDefault: derive from GtkBox, not GtkVBox --- gtk/gtkfilechooserdefault.c | 9 ++++++--- gtk/gtkfilechooserprivate.h | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 6fdafa04e0..831b2a95fd 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -69,7 +69,8 @@ #include "gtktreednd.h" #include "gtktreeprivate.h" #include "gtktreeselection.h" -#include "gtkvbox.h" +#include "gtkbox.h" +#include "gtkorientable.h" #include "gtkintl.h" #include @@ -149,7 +150,7 @@ typedef struct _GtkFileChooserDefaultClass GtkFileChooserDefaultClass; struct _GtkFileChooserDefaultClass { - GtkVBoxClass parent_class; + GtkBoxClass parent_class; }; /* Signal IDs */ @@ -460,7 +461,7 @@ static GtkTreeModel *shortcuts_pane_model_filter_new (GtkFileChooserDefault *imp -G_DEFINE_TYPE_WITH_CODE (GtkFileChooserDefault, _gtk_file_chooser_default, GTK_TYPE_VBOX, +G_DEFINE_TYPE_WITH_CODE (GtkFileChooserDefault, _gtk_file_chooser_default, GTK_TYPE_BOX, G_IMPLEMENT_INTERFACE (GTK_TYPE_FILE_CHOOSER, gtk_file_chooser_default_iface_init) G_IMPLEMENT_INTERFACE (GTK_TYPE_FILE_CHOOSER_EMBED, @@ -741,6 +742,8 @@ _gtk_file_chooser_default_init (GtkFileChooserDefault *impl) impl->recent_manager = gtk_recent_manager_get_default (); impl->create_folders = TRUE; + gtk_orientable_set_orientation (GTK_ORIENTABLE (impl), + GTK_ORIENTATION_VERTICAL); gtk_box_set_spacing (GTK_BOX (impl), 12); set_file_system_backend (impl); diff --git a/gtk/gtkfilechooserprivate.h b/gtk/gtkfilechooserprivate.h index e414e43d2d..117900fa32 100644 --- a/gtk/gtkfilechooserprivate.h +++ b/gtk/gtkfilechooserprivate.h @@ -32,7 +32,7 @@ #include "gtktreemodelsort.h" #include "gtktreestore.h" #include "gtktreeview.h" -#include "gtkvbox.h" +#include "gtkbox.h" G_BEGIN_DECLS @@ -154,7 +154,7 @@ typedef enum { struct _GtkFileChooserDefault { - GtkVBox parent_instance; + GtkBox parent_instance; GtkFileChooserAction action; -- 2.30.2